merge with xen-unstable.hg (staging)
authorAlex Williamson <alex.williamson@hp.com>
Wed, 12 Dec 2007 17:50:03 +0000 (10:50 -0700)
committerAlex Williamson <alex.williamson@hp.com>
Wed, 12 Dec 2007 17:50:03 +0000 (10:50 -0700)

Trivial merge